gdk: Use G_PARAM_SPEC_STATIC_STRINGS throughout

This avoids some string copies at startup.

diff --git a/gdk/gdkcursor.c b/gdk/gdkcursor.c
index 6b50345c2592ee10c62d20f190db04aad45ab2fe..75c8661f70f7c20974d4be9b1a20c07a67bb5ecb 100644 (file)
--- a/gdk/gdkcursor.c
+++ b/gdk/gdkcursor.c
@@ -183,35 +183,40 @@ gdk_cursor_class_init (GdkCursorClass *cursor_class)
                                                         P_("Fallback"),
                                                         P_("Cursor image to fall back to if this cursor cannot be displayed"),
                                                         GDK_TYPE_CURSOR,
-                                                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+                                                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
+                                                        G_PARAM_STATIC_STRINGS));
   g_object_class_install_property (object_class,
                                   PROP_HOTSPOT_X,
                                   g_param_spec_int ("hotspot-x",
                                                      P_("Hotspot X"),
                                                      P_("Horizontal offset of the cursor hotspot"),
                                                      0, G_MAXINT, 0,
-                                                     G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+                                                     G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
+                                                     G_PARAM_STATIC_STRINGS));
   g_object_class_install_property (object_class,
                                   PROP_HOTSPOT_Y,
                                   g_param_spec_int ("hotspot-y",
                                                      P_("Hotspot Y"),
                                                      P_("Vertical offset of the cursor hotspot"),
                                                      0, G_MAXINT, 0,
-                                                     G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+                                                     G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
+                                                     G_PARAM_STATIC_STRINGS));
   g_object_class_install_property (object_class,
                                   PROP_NAME,
                                   g_param_spec_string ("name",
                                                         P_("Name"),
                                                         P_("Name of this cursor"),
                                                         NULL,
-                                                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+                                                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
+                                                        G_PARAM_STATIC_STRINGS));
   g_object_class_install_property (object_class,
                                   PROP_TEXTURE,
                                   g_param_spec_object ("texture",
                                                         P_("Texture"),
                                                         P_("The texture displayed by this cursor"),
                                                         GDK_TYPE_TEXTURE,
-                                                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+                                                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
+                                                        G_PARAM_STATIC_STRINGS));
 }
 
 static void

diff --git a/gdk/gdkdevice.c b/gdk/gdkdevice.c
index e6aa33587cceab2f1639c333148dd5e7f245faa3..4a2aee9d7e39d5af05de8829548f77820b86df55 100644 (file)
--- a/gdk/gdkdevice.c
+++ b/gdk/gdkdevice.c
@@ -123,8 +123,7 @@ gdk_device_class_init (GdkDeviceClass *klass)
                            P_("Device Display"),
                            P_("Display which the device belongs to"),
                            GDK_TYPE_DISPLAY,
-                           G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
-                           G_PARAM_STATIC_STRINGS);
+                           G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
 
   /**
    * GdkDevice:device-manager:
@@ -138,8 +137,7 @@ gdk_device_class_init (GdkDeviceClass *klass)
                            P_("Device manager"),
                            P_("Device manager which the device belongs to"),
                            GDK_TYPE_DEVICE_MANAGER,
-                           G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
-                           G_PARAM_STATIC_STRINGS);
+                           G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
   /**
    * GdkDevice:name:
    *

diff --git a/gdk/gdkdevicetool.c b/gdk/gdkdevicetool.c
index 1b1cd38606353724248a236f771236988574ec36..be8122568d85f4f3923374f6c50f11d8a1f70495 100644 (file)
--- a/gdk/gdkdevicetool.c
+++ b/gdk/gdkdevicetool.c
@@ -106,14 +106,16 @@ gdk_device_tool_class_init (GdkDeviceToolClass *klass)
                                                       "Serial number",
                                                       0, G_MAXUINT64, 0,
                                                       G_PARAM_READWRITE |
-                                                      G_PARAM_CONSTRUCT_ONLY);
+                                                      G_PARAM_CONSTRUCT_ONLY |
+                                                      G_PARAM_STATIC_STRINGS);
   tool_props[TOOL_PROP_TOOL_TYPE] = g_param_spec_enum ("tool-type",
                                                        "Tool type",
                                                        "Tool type",
                                                        GDK_TYPE_DEVICE_TOOL_TYPE,
                                                        GDK_DEVICE_TOOL_TYPE_UNKNOWN,
                                                        G_PARAM_READWRITE |
-                                                       G_PARAM_CONSTRUCT_ONLY);
+                                                       G_PARAM_CONSTRUCT_ONLY |
+                                                       G_PARAM_STATIC_STRINGS);
   tool_props[TOOL_PROP_AXES] = g_param_spec_flags ("axes",
                                                    "Axes",
                                                    "Tool axes",
@@ -125,7 +127,8 @@ gdk_device_tool_class_init (GdkDeviceToolClass *klass)
                                                            "Hardware ID",
                                                            0, G_MAXUINT64, 0,
                                                            G_PARAM_READWRITE |
-                                                           G_PARAM_CONSTRUCT_ONLY);
+                                                           G_PARAM_CONSTRUCT_ONLY |
+                                                           G_PARAM_STATIC_STRINGS);
 
   g_object_class_install_properties (object_class, N_TOOL_PROPS, tool_props);
 }

diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
index 39e9884f537b95ec65225382f7568c2124fe4290..0d51b96811671943e13e6d87237c961025712552 100644 (file)
--- a/gdk/gdkdisplay.c
+++ b/gdk/gdkdisplay.c
@@ -214,7 +214,7 @@ gdk_display_class_init (GdkDisplayClass *class)
                           P_("Composited"),
                           P_("Composited"),
                           TRUE,
-                          G_PARAM_READABLE);
+                          G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
   /**
    * GdkDisplay:rgba:
@@ -229,7 +229,7 @@ gdk_display_class_init (GdkDisplayClass *class)
                           P_("RGBA"),
                           P_("RGBA"),
                           TRUE,
-                          G_PARAM_READABLE);
+                          G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
   g_object_class_install_properties (object_class, LAST_PROP, props);
 

diff --git a/gdk/gdkdisplaymanager.c b/gdk/gdkdisplaymanager.c
index 6d328d8b417df33d47a868159519f607a7e11284..3faaf82e12ac679cd3146112ac2d69813fe6da48 100644 (file)
--- a/gdk/gdkdisplaymanager.c
+++ b/gdk/gdkdisplaymanager.c
@@ -168,8 +168,7 @@ gdk_display_manager_class_init (GdkDisplayManagerClass *klass)
                                                         P_("Default Display"),
                                                         P_("The default display for GDK"),
                                                         GDK_TYPE_DISPLAY,
-                                                        G_PARAM_READWRITE|G_PARAM_STATIC_NAME|
-                                                        G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB));
+                                                        G_PARAM_READWRITE|G_PARAM_STATIC_STRINGS));
 }
 
 static void

diff --git a/gdk/gdkmonitor.c b/gdk/gdkmonitor.c
index 3e8ec272b5a366c63abed9c4486edc0d39720461..d36670e8068e7ad260304075a7f464c1ebe85bc6 100644 (file)
--- a/gdk/gdkmonitor.c
+++ b/gdk/gdkmonitor.c
@@ -178,76 +178,76 @@ gdk_monitor_class_init (GdkMonitorClass *class)
                          "Display",
                          "The display of the monitor",
                          GDK_TYPE_DISPLAY,
-                         G_PARAM_READWRITE|G_PARAM_CONSTRUCT_ONLY);
+                         G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
   props[PROP_MANUFACTURER] =
     g_param_spec_string ("manufacturer",
                          "Manufacturer",
                          "The manufacturer name",
                          NULL,
-                         G_PARAM_READABLE);
+                         G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
   props[PROP_MODEL] =
     g_param_spec_string ("model",
                          "Model",
                          "The model name",
                          NULL,
-                         G_PARAM_READABLE);
+                         G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
   props[PROP_SCALE_FACTOR] =
     g_param_spec_int ("scale-factor",
                       "Scale factor",
                       "The scale factor",
                       0, G_MAXINT,
                       1,
-                      G_PARAM_READABLE);
+                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
   props[PROP_GEOMETRY] =
     g_param_spec_boxed ("geometry",
                         "Geometry",
                         "The geometry of the monitor",
                         GDK_TYPE_RECTANGLE,
-                        G_PARAM_READABLE);
+                        G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
   props[PROP_WORKAREA] =
     g_param_spec_boxed ("workarea",
                         "Workarea",
                         "The workarea of the monitor",
                         GDK_TYPE_RECTANGLE,
-                        G_PARAM_READABLE);
+                        G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
   props[PROP_WIDTH_MM] =
     g_param_spec_int ("width-mm",
                       "Physical width",
                       "The width of the monitor, in millimeters",
                       0, G_MAXINT,
                       0,
-                      G_PARAM_READABLE);
+                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
   props[PROP_HEIGHT_MM] =
     g_param_spec_int ("height-mm",
                       "Physical height",
                       "The height of the monitor, in millimeters",
                       0, G_MAXINT,
                       0,
-                      G_PARAM_READABLE);
+                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
   props[PROP_REFRESH_RATE] =
     g_param_spec_int ("refresh-rate",
                       "Refresh rate",
                       "The refresh rate, in millihertz",
                       0, G_MAXINT,
                       0,
-                      G_PARAM_READABLE);
+                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
   props[PROP_SUBPIXEL_LAYOUT] =
     g_param_spec_enum ("subpixel-layout",
                        "Subpixel layout",
                        "The subpixel layout",
                        GDK_TYPE_SUBPIXEL_LAYOUT,
                        GDK_SUBPIXEL_LAYOUT_UNKNOWN,
-                       G_PARAM_READABLE);
+                       G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
   props[PROP_VALID] =
     g_param_spec_boolean ("valid",
                           "Valid",
                           "Whether the monitor is still valid",
                           TRUE,
-                          G_PARAM_READABLE);
+                          G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
   g_object_class_install_properties (object_class, LAST_PROP, props);
 
-  signals[INVALIDATE] = g_signal_new ("invalidate",
+  signals[INVALIDATE] = g_signal_new (g_intern_static_string ("invalidate"),
                                       G_TYPE_FROM_CLASS (object_class),
                                       G_SIGNAL_RUN_FIRST,
                                       0,

diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index 148596b6001c96392b4ea2fc3f90f2ca5a301c4e..1fbd5d055ee81216d2f100ab0cdd93e399a2cbe4 100644 (file)
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -258,7 +258,7 @@ gdk_window_class_init (GdkWindowClass *klass)
                            P_("Cursor"),
                            P_("Cursor"),
                            GDK_TYPE_CURSOR,
-                           G_PARAM_READWRITE);
+                           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
 
   /**
    * GdkWindow:display:
@@ -273,7 +273,7 @@ gdk_window_class_init (GdkWindowClass *klass)
                            P_("Display"),
                            P_("Display"),
                            GDK_TYPE_DISPLAY,
-                           G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
+                           G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
 
   g_object_class_install_properties (object_class, LAST_PROP, properties);
 

diff --git a/gdk/x11/gdkdevice-xi2.c b/gdk/x11/gdkdevice-xi2.c
index c23654f7978abe745eb985adcae9572589af5236..ab266b6b0b451ee9fe92b204092b0a61c8d65af5 100644 (file)
--- a/gdk/x11/gdkdevice-xi2.c
+++ b/gdk/x11/gdkdevice-xi2.c
@@ -141,7 +141,8 @@ gdk_x11_device_xi2_class_init (GdkX11DeviceXI2Class *klass)
                                                      P_("Device ID"),
                                                      P_("Device identifier"),
                                                      0, G_MAXINT, 0,
-                                                     G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+                                                     G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
+                                                     G_PARAM_STATIC_STRINGS));
 }
 
 static void

diff --git a/gdk/x11/gdkdevicemanager-xi2.c b/gdk/x11/gdkdevicemanager-xi2.c
index aafc040eef9a7b1b8b765deb7df18f0c8fcf1d63..51a89db6b1912b6cb6136879f0b07d18ea898d19 100644 (file)
--- a/gdk/x11/gdkdevicemanager-xi2.c
+++ b/gdk/x11/gdkdevicemanager-xi2.c
@@ -115,21 +115,24 @@ gdk_x11_device_manager_xi2_class_init (GdkX11DeviceManagerXI2Class *klass)
                                                      P_("Opcode"),
                                                      P_("Opcode for XInput2 requests"),
                                                      0, G_MAXINT, 0,
-                                                     G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+                                                     G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
+                                                     G_PARAM_STATIC_STRINGS));
   g_object_class_install_property (object_class,
                                    PROP_MAJOR,
                                    g_param_spec_int ("major",
                                                      P_("Major"),
                                                      P_("Major version number"),
                                                      0, G_MAXINT, 0,
-                                                     G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+                                                     G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
+                                                     G_PARAM_STATIC_STRINGS));
   g_object_class_install_property (object_class,
                                    PROP_MINOR,
                                    g_param_spec_int ("minor",
                                                      P_("Minor"),
                                                      P_("Minor version number"),
                                                      0, G_MAXINT, 0,
-                                                     G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+                                                     G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
+                                                     G_PARAM_STATIC_STRINGS));
 }
 
 static void